projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2e2fa27)
Various tweaks to restore happiness to the MSVC builds.
authorrobertl <robertl>
Mon, 14 Aug 2006 00:02:49 +0000 (00:02 +0000)
committerrobertl <robertl>
Mon, 14 Aug 2006 00:02:49 +0000 (00:02 +0000)
gbfile: use fatal instead of abort.

gbfile.c patch | blob | history
msvc/GPSBabel.sln patch | blob | history
msvc/GPSBabel.vcproj patch | blob | history
msvc/config.h patch | blob | history
stmsdf.c patch | blob | history

diff --git a/gbfile.c b/gbfile.c
index 35748b776698e3a02d43f0f4958778955ab2064c..57fb40fda4038eac18033ffc188182f8737fd2ae 100644 (file)
--- a/gbfile.c
+++ b/gbfile.c
@@ -34,12 +34,13 @@
 /* taken from minigzip.c (part of the zlib project) */
 #  include <fcntl.h>
 #  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#  define SET_BINARY_MODE(file) _setmode(fileno(file), O_BINARY)
 #else
 #  define SET_BINARY_MODE(file)
 #endif
 
 #define MYNAME "gbfile"
+#define NO_ZLIB "No zlib support"
 
 /* About the ZLIB_INHIBITED stuff:
  * 
@@ -159,7 +160,7 @@ gbfclose(gbfile *file)
 #if !ZLIB_INHIBITED
                gzclose(file->handle.gz);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -218,12 +219,10 @@ gbfread(void *buf, const gbsize_t size, const gbsize_t members, gbfile *file)
        if ((size == 0) || (members == 0)) return 0;
        
        if (file->gzapi) {
-               int result;
 #if !ZLIB_INHIBITED
+               int result;
                result = gzread(file->handle.gz, buf, size * members) / size;
-#else
-               abort();
-#endif
+
                if ((result < 0) || ((gbsize_t)result < members)) {
                        int errnum;
                        const char *errtxt;
@@ -234,6 +233,9 @@ gbfread(void *buf, const gbsize_t size, const gbsize_t members, gbfile *file)
                                        file->module, errnum, errtxt);
                }
                return (gbsize_t) result;
+#else
+               fatal(NO_ZLIB);
+#endif
        }
        else {
                int errno;
@@ -302,7 +304,7 @@ gbfwrite(const void *buf, const gbsize_t size, const gbsize_t members, gbfile *f
 #if !ZLIB_INHIBITED
                result = gzwrite(file->handle.gz, buf, size * members) / size;
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -326,7 +328,7 @@ gbfflush(gbfile *file)
 #if !ZLIB_INHIBITED
                return gzflush(file->handle.gz, Z_SYNC_FLUSH);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -356,7 +358,7 @@ gbferror(gbfile *file)
 #if !ZLIB_INHIBITED
                (void)gzerror(file->handle.gz, &errnum);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -403,7 +405,7 @@ gbftell(gbfile *file)
 #if !ZLIB_INHIBITED
                return gztell(file->handle.gz);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -418,7 +420,7 @@ gbfeof(gbfile *file)
 #if !ZLIB_INHIBITED
                return gzeof(file->handle.gz);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
@@ -429,16 +431,18 @@ gbfeof(gbfile *file)
 int
 gbfungetc(const int c, gbfile *file)
 {
+       int r = -1;
        if (file->gzapi) {
 #if !ZLIB_INHIBITED
-               return gzungetc(c, file->handle.gz);
+               r = gzungetc(c, file->handle.gz);
 #else
-               abort();
+               fatal(NO_ZLIB);
 #endif
        }
        else {
-               return ungetc(c, file->handle.std);
+               r = ungetc(c, file->handle.std);
        }
+       return r;
 }
 
 /* GPSBabel 'file' enhancements */
diff --git a/msvc/GPSBabel.sln b/msvc/GPSBabel.sln
index 538236d6f9ea21855dd53760b1fbae771b80b2c1..02748b73fec1fd53bb66b164eadca8def0f03a98 100644 (file)
--- a/msvc/GPSBabel.sln
+++ b/msvc/GPSBabel.sln
@@ -1,18 +1,20 @@
-\r
 Microsoft Visual Studio Solution File, Format Version 9.00\r
 # Visual C++ Express 2005\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcproj", "{D81B30A1-C560-42BC-AE80-257FDDD484D8}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPSBabel", "GPSBabel.vcproj", "{EB2609DB-5800-45B2-BCB2-06D72F389DCA}"\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
                Release|Win32 = Release|Win32\r
+               Unicode|Win32 = Unicode|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {D81B30A1-C560-42BC-AE80-257FDDD484D8}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {D81B30A1-C560-42BC-AE80-257FDDD484D8}.Debug|Win32.Build.0 = Debug|Win32\r
-               {D81B30A1-C560-42BC-AE80-257FDDD484D8}.Release|Win32.ActiveCfg = Release|Win32\r
-               {D81B30A1-C560-42BC-AE80-257FDDD484D8}.Release|Win32.Build.0 = Release|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Debug|Win32.ActiveCfg = Unicode|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Debug|Win32.Build.0 = Unicode|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Release|Win32.ActiveCfg = Release|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Release|Win32.Build.0 = Release|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Unicode|Win32.ActiveCfg = Unicode|Win32\r
+               {EB2609DB-5800-45B2-BCB2-06D72F389DCA}.Unicode|Win32.Build.0 = Unicode|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
diff --git a/msvc/GPSBabel.vcproj b/msvc/GPSBabel.vcproj
index 8fc9f48b1adece80f63ecdf04efc29453629d11a..98c9c4fb6f297a48b8c02634cbe48218d2be045a 100644 (file)
--- a/msvc/GPSBabel.vcproj
+++ b/msvc/GPSBabel.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="GPSBabel"\r
-       ProjectGUID="{D81B30A1-C560-42BC-AE80-257FDDD484D8}"\r
+       ProjectGUID="{EB2609DB-5800-45B2-BCB2-06D72F389DCA}"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -42,11 +42,15 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="3"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="expat,..\coldsync;."\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__WIN32__;VERSION=\&quot;1.3.0\&quot;;_CRT_SECURE_NO_DEPRECATE"\r
+                               EnableIntrinsicFunctions="false"\r
+                               FavorSizeOrSpeed="2"\r
+                               WholeProgramOptimization="true"\r
+                               AdditionalIncludeDirectories="expat,..\coldsync,."\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;__WIN32__;"\r
                                StringPooling="true"\r
+                               ExceptionHandling="0"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="0"\r
@@ -138,8 +142,8 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="expat,..\coldsync;."\r
-                               PreprocessorDefinitions="WIN32;__WIN32__;_DEBUG;_CONSOLE;VERSION=\&quot;1.3.0\&quot;;_CRT_SECURE_NO_DEPRECATE"\r
+                               AdditionalIncludeDirectories="expat;..\coldsync;."\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                UsePrecompiledHeader="0"\r
@@ -201,6 +205,104 @@
                                Name="VCPostBuildEventTool"\r
                        />\r
                </Configuration>\r
+               <Configuration\r
+                       Name="Unicode|Win32"\r
+                       OutputDirectory="$(ConfigurationName)"\r
+                       IntermediateDirectory="$(ConfigurationName)"\r
+                       ConfigurationType="1"\r
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               TypeLibraryName=".\Release/GPSBabel.tlb"\r
+                               HeaderFileName=""\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="1"\r
+                               EnableIntrinsicFunctions="false"\r
+                               FavorSizeOrSpeed="2"\r
+                               WholeProgramOptimization="true"\r
+                               AdditionalIncludeDirectories="expatw,..\coldsync,."\r
+                               PreprocessorDefinitions="XML_UNICODE=1;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;__WIN32__;"\r
+                               StringPooling="true"\r
+                               ExceptionHandling="0"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               UsePrecompiledHeader="0"\r
+                               PrecompiledHeaderFile=".\unicode/GPSBabel.pch"\r
+                               AssemblerListingLocation=".\unicode/"\r
+                               ObjectFile=".\unicode/"\r
+                               ProgramDataBaseFileName=".\unicode/"\r
+                               WarningLevel="3"\r
+                               WarnAsError="true"\r
+                               SuppressStartupBanner="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalDependencies="setupapi.lib expatw\libexpatw.lib"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="true"\r
+                               GenerateDebugInformation="false"\r
+                               AssemblyDebug="0"\r
+                               ProgramDatabaseFile=".\unicode/GPSBabel.pdb"\r
+                               SubSystem="1"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
        </Configurations>\r
        <References>\r
        </References>\r
@@ -238,6 +340,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\axim_gpb.c"\r
@@ -284,11 +396,25 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\coastexp.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\compegps.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\copilot.c"\r
                                >\r
@@ -314,6 +440,20 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\coto.c"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\cst.c"\r
@@ -344,6 +484,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\delgpl.c"\r
@@ -370,6 +520,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\discard.c"\r
@@ -400,6 +560,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\easygps.c"\r
@@ -426,6 +596,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\fatal.c"\r
@@ -460,6 +640,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\formspec.c"\r
@@ -490,6 +680,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\garmin_fs.c"\r
@@ -499,6 +699,14 @@
                                RelativePath="..\garmin_tables.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\garmin_txt.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\gbfile.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\gbser.c"\r
                                >\r
@@ -536,6 +744,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\gdb.c"\r
@@ -566,6 +784,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\geoniche.c"\r
@@ -592,6 +820,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\globals.c"\r
@@ -630,6 +868,28 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\jeeps\gpsdevice.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\jeeps\gpsdevice_ser.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\jeeps\gpsdevice_usb.c"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\gpspilot.c"\r
@@ -656,6 +916,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\gpssim.c"\r
@@ -686,6 +956,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\gpx.c"\r
@@ -712,6 +992,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\grtcirc.c"\r
@@ -738,6 +1028,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\gtm.c"\r
@@ -772,6 +1072,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\hsa_ndv.c"\r
@@ -802,6 +1112,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\igc.c"\r
@@ -840,6 +1160,20 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\interpolate.c"\r
+                               >\r
                        </File>\r
                        <File\r
                                RelativePath="..\kml.c"\r
@@ -853,6 +1187,10 @@
                                RelativePath="..\lowranceusr.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\mag_pdb.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\maggeo.c"\r
                                >\r
@@ -882,6 +1220,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\magproto.c"\r
@@ -908,6 +1256,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\main.c"\r
@@ -934,6 +1292,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\mapopolis.c"\r
@@ -960,6 +1328,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\mapsend.c"\r
@@ -986,6 +1364,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\mapsource.c"\r
@@ -1012,6 +1400,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\mkshort.c"\r
@@ -1038,6 +1436,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\msroute.c"\r
@@ -1068,6 +1476,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\netstumbler.c"\r
@@ -1094,6 +1512,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\nmea.c"\r
@@ -1120,11 +1548,25 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\nmn4.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\nukedata.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\overlay.c"\r
                                >\r
@@ -1154,6 +1596,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\palmdoc.c"\r
@@ -1180,6 +1632,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\pathaway.c"\r
@@ -1210,6 +1672,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\polygon.c"\r
@@ -1236,6 +1708,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\position.c"\r
@@ -1262,6 +1744,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\psitrex.c"\r
@@ -1288,6 +1780,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\psp.c"\r
@@ -1314,6 +1816,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\queue.c"\r
@@ -1340,6 +1852,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\quovadis.c"\r
@@ -1366,6 +1888,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\reverse_route.c"\r
@@ -1392,6 +1924,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\rgbcolors.c"\r
@@ -1422,6 +1964,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\saroute.c"\r
@@ -1448,6 +2000,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\shape.c"\r
@@ -1478,6 +2040,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\sort.c"\r
@@ -1504,11 +2076,25 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\stackfilter.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\stmsdf.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\stmwpp.c"\r
                                >\r
@@ -1546,6 +2132,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\textfile.c"\r
@@ -1576,6 +2172,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\tmpro.c"\r
@@ -1602,6 +2208,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\tomtom.c"\r
@@ -1632,6 +2248,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\tpo.c"\r
@@ -1645,6 +2271,10 @@
                                RelativePath="..\unicsv.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\units.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\util.c"\r
                                >\r
@@ -1670,6 +2300,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\util_crc.c"\r
@@ -1696,6 +2336,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\uuid.c"\r
@@ -1730,6 +2380,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\vitosmt.c"\r
@@ -1760,6 +2420,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\waypt.c"\r
@@ -1786,6 +2456,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\wbt-200.c"\r
@@ -1820,6 +2500,16 @@
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Unicode|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               Optimization="2"\r
+                                               AdditionalIncludeDirectories=""\r
+                                               PreprocessorDefinitions=""\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\xmlgeneric.c"\r
@@ -1865,6 +2555,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpscom.c"\r
@@ -1895,18 +2597,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\jeeps\gpsdevice.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\jeeps\gpsdevice_ser.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\jeeps\gpsdevice_usb.c"\r
-                                       >\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsmath.c"\r
@@ -1937,6 +2639,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsmem.c"\r
@@ -1967,6 +2681,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsprot.c"\r
@@ -1997,6 +2723,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsread.c"\r
@@ -2027,6 +2765,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsrqst.c"\r
@@ -2057,6 +2807,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpssend.c"\r
@@ -2087,6 +2849,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsserial.c"\r
@@ -2117,6 +2891,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsusbcommon.c"\r
@@ -2163,6 +2949,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Jeeps/"\r
+                                                       ProgramDataBaseFileName="Release\Jeeps/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
@@ -2197,6 +2995,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Coldsync/"\r
+                                                       ProgramDataBaseFileName="Release\Coldsync/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="..\coldsync\util.c"\r
@@ -2227,6 +3037,18 @@
                                                        BrowseInformation="1"\r
                                                />\r
                                        </FileConfiguration>\r
+                                       <FileConfiguration\r
+                                               Name="Unicode|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       Optimization="2"\r
+                                                       AdditionalIncludeDirectories=""\r
+                                                       PreprocessorDefinitions=""\r
+                                                       ObjectFile=".\Release\Coldsync/"\r
+                                                       ProgramDataBaseFileName="Release\Coldsync/"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
@@ -2259,11 +3081,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\gbser.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\gbser_private.h"\r
+                               RelativePath="..\jeeps\gpsdevice.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -2385,6 +3203,10 @@
                                        RelativePath="..\jeeps\gpsserial.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\jeeps\gpsusbcommon.h"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\jeeps\gpsusbint.h"\r
                                        >\r
@@ -2400,6 +3222,10 @@
                        Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
                        >\r
                </Filter>\r
+               <Filter\r
+                       Name="NewFilter1"\r
+                       >\r
+               </Filter>\r
        </Files>\r
        <Globals>\r
        </Globals>\r
diff --git a/msvc/config.h b/msvc/config.h
index 53a7498c3edbea961a8c2d8dbe5b0c03dd73f116..0ca922303c3555127e7777639775872e64389b3c 100644 (file)
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -20,3 +20,9 @@
 /* 1 to enable shapefile support */\r
 #undef SHAPELIB_ENABLED\r
 \r
+#define ZLIB_INHIBITED 1\r
+\r
+/* We really should figure out some way to get this from autoconf into\r
+ * a file so that the MSVC build can pick it up\r
+ */\r
+#define VERSION "1.3.0-development"\r
diff --git a/stmsdf.c b/stmsdf.c
index b90ce8bddf5d416aa84b0cfa71647f089b527eca..e0f73e44c6c405c302d07553811333f80329c003 100644 (file)
--- a/stmsdf.c
+++ b/stmsdf.c
@@ -52,8 +52,9 @@ typedef enum {
 
 static gbfile *fin, *fout;
 
-typedef struct stmsdf_s {
-} stmsdf_t;
+// Empty structs aren't C89.  But this wasn't being used anyway.
+//typedef struct stmsdf_s {
+//} stmsdf_t;
 
 static int lineno;
 static int datum;
Unnamed repository; edit this file 'description' to name the repository.